From 69cbf0a129b7965a02fa03dce58da8bba413338c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 10 Nov 2015 12:26:05 -0500
Subject: [PATCH] Adwaita: update tooltip styling

Adapt to the changes in the previous commit. Note that tooltip
appearance is currently affected by tooltips having lost their
csd nature, due to a regression.
---
 gtk/theme/Adwaita/_common.scss           | 14 ++++++--------
 gtk/theme/Adwaita/gtk-contained-dark.css | 16 +++++++---------
 gtk/theme/Adwaita/gtk-contained.css      | 16 +++++++---------
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 9eabe3b725..75baa7bed4 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3043,7 +3043,7 @@ infobar {
  * Tooltips *
  ************/
 
-.tooltip {
+tooltip {
   &.background {
     // background-color needs to be set this way otherwise it gets drawn twice
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
@@ -3063,12 +3063,10 @@ infobar {
   decoration.csd {
     background-color: transparent;
   }
-}
-
-.tooltip * { //Yeah this is ugly
-  padding: 4px;
-  background-color: transparent;
-  color: inherit; // just to be sure
+  * { //Yeah this is ugly
+    padding: 4px;
+    background-color: transparent;
+  }
 }
 
 /*****************
@@ -3276,7 +3274,7 @@ decoration {
     box-shadow: 0 1px 2px transparentize(black, 0.8),
                 0 0 0 1px transparentize($_wm_border,0.1);
   }
-  .csd.tooltip & {
+  tooltip.csd & {
     border-radius: 5px;
     box-shadow: none;
   }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 3fb983108f..aff2631e93 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4260,24 +4260,22 @@ infobar {
 /************
  * Tooltips *
  ************/
-.tooltip {
+tooltip {
   color: white;
   padding: 4px;
   /* not working */
   border-radius: 5px;
   box-shadow: none;
   text-shadow: 0 1px black; }
-  .tooltip.background {
+  tooltip.background {
     background-color: rgba(0, 0, 0, 0.8);
     background-clip: padding-box;
     border: 1px solid rgba(255, 255, 255, 0.1); }
-  .tooltip decoration.csd {
+  tooltip decoration.csd {
+    background-color: transparent; }
+  tooltip * {
+    padding: 4px;
     background-color: transparent; }
-
-.tooltip * {
-  padding: 4px;
-  background-color: transparent;
-  color: inherit; }
 
 /*****************
  * Color Chooser *
@@ -4418,7 +4416,7 @@ decoration {
   .csd.popup decoration {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
-  .csd.tooltip decoration {
+  tooltip.csd decoration {
     border-radius: 5px;
     box-shadow: none; }
   messagedialog.csd decoration {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index a68ff77b20..c54fbaab79 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4432,24 +4432,22 @@ infobar {
 /************
  * Tooltips *
  ************/
-.tooltip {
+tooltip {
   color: white;
   padding: 4px;
   /* not working */
   border-radius: 5px;
   box-shadow: none;
   text-shadow: 0 1px black; }
-  .tooltip.background {
+  tooltip.background {
     background-color: rgba(0, 0, 0, 0.8);
     background-clip: padding-box;
     border: 1px solid rgba(255, 255, 255, 0.1); }
-  .tooltip decoration.csd {
+  tooltip decoration.csd {
+    background-color: transparent; }
+  tooltip * {
+    padding: 4px;
     background-color: transparent; }
-
-.tooltip * {
-  padding: 4px;
-  background-color: transparent;
-  color: inherit; }
 
 /*****************
  * Color Chooser *
@@ -4590,7 +4588,7 @@ decoration {
   .csd.popup decoration {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
-  .csd.tooltip decoration {
+  tooltip.csd decoration {
     border-radius: 5px;
     box-shadow: none; }
   messagedialog.csd decoration {
-- 
2.30.2